d/rules: Show the detailed test log even if tests all succeed

When we start accepting minor differences, we'll want to know how much
the difference actually was.

diff --git a/debian/clean b/debian/clean
index 9ef75f24e2bab3e961743a703b387862cde74121..5698f2ed955a36ac8efeaf5029ec1ee15948b5ee 100644 (file)
--- a/debian/clean
+++ b/debian/clean
@@ -1,2 +1,3 @@
+debian/tests-failed
 gtk/gtkdbusgenerated.c
 gtk/gtkdbusgenerated.h

diff --git a/debian/rules b/debian/rules
index 7838d90007bbd2e4cf41676947833b3a36f75686..4fdf448233ae2a16756f96901c44fc8fb269e82f 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -217,6 +217,7 @@ endif
 #        (4.0.1) many failures (endianness?)
 override_dh_auto_test:
 ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
+       rm -f debian/tests-failed
        # Mark reftests with known failures as non-fatal
        #touch testsuite/reftests/nonresizable-size.ui.known_fail
        #touch testsuite/reftests/window-show-contents-on-map.ui.known_fail
@@ -246,11 +247,9 @@ ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
                -- \
                --setup=x11 \
                --timeout-multiplier $(test_timeout_multiplier) \
-       || { \
-               e=$$?; \
-               tail -v -n +0 debian/build/deb/meson-logs/testlog-x11.txt; \
-               exit $$e; \
-       }
+       || touch debian/tests-failed
+       tail -v -n +0 debian/build/deb/meson-logs/testlog-x11.txt
+       if test -e debian/tests-failed; then exit 1; fi
 endif
 
 override_dh_auto_install: